prepare-root: Don't hardcode sysroot

Follow to previous change to factor out composefs mounting;
prep for soft reboots.

Signed-off-by: Colin Walters <walters@verbum.org>

diff --git a/src/libotcore/otcore-prepare-root.c b/src/libotcore/otcore-prepare-root.c
index 01acf5cfecc3d96349febba0e10842cf453113bb..fa990dec20b7f34b9d65f09757851d50d19a9c13 100644 (file)
--- a/src/libotcore/otcore-prepare-root.c
+++ b/src/libotcore/otcore-prepare-root.c
@@ -375,7 +375,8 @@ otcore_mount_composefs (ComposefsConfig *composefs_config, GVariantBuilder *meta
   if (composefs_config->enabled == OT_TRISTATE_NO)
     return TRUE;
 
-  const char *objdirs[] = { "/sysroot/ostree/repo/objects" };
+  g_autofree char *sysroot_objects = g_strdup_printf ("%s/ostree/repo/objects", root_mountpoint);
+  const char *objdirs[] = { sysroot_objects };
   struct lcfs_mount_options_s cfs_options = {
     objdirs,
     1,